Merge "Add mising AAPT2 dependency" into oc-dr1-dev