Merge "Reverted aapt dependency to be a dependency on libandroidfw" am: 86554e949b
am: fe6e279aeb

Change-Id: Ie8a3ec29f16dfe4fff9f54d00c31c66707e3f8b2