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

Change-Id: I056a754497068f71e7a22de83e868e9958772719