Merge "Add mising AAPT2 dependency"
am: 25a4c9481b

Change-Id: Id4e6eef46a6081869a66be2f18a991d628947a2a