Merge "Add mising AAPT2 dependency" am: 25a4c9481b
am: ac47d13b2e

Change-Id: I1a56a0da5d328ba2037fba82db92c5cf55bd37aa