Merge "aapt no longer needed for signing APKs"
am: 3cfff7386f

Change-Id: I95e90f0c4e31fe79bb72a302bec2d89885959533