am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt"
am 8aa93764: Merge "Fixing NULL pointer access causing segmentation fault in aapt"

* commit '8aa93764ea025b1c20f96b366ae6efb17e4f2d67':
  Fixing NULL pointer access causing segmentation fault in aapt

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base