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

Change-Id: I0a7c35f33da2d841e365d06ae26644a19077a226