Merge "Add mising AAPT2 dependency" into oc-dr1-dev
am: 393eee9462  -s ours

Change-Id: Ic13ed55f316c1be6af07f690f8d4a247736d628f