Merge "Fix aapt badging segmentation fault" into sc-dev