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

Change-Id: Ie11997e510592dff6528d78615e1d0fb3d86c9dc