Merge "Remove unused aapt target." into mnc-dev