Merge "Fixing NULL pointer access causing segmentation fault in aapt"