Merge "Fix segmentation fault in aapt2" into sc-dev