Merge "Add mising AAPT2 dependency" am: 25a4c9481b am: ac47d13b2e am: 18ce90bce3
am: d6fa871e26

Change-Id: I393d9a2fd362366df8c0e13a2b102506f3526fe1