Merge "aapt no longer needed for signing APKs"