Merge "Add mising AAPT2 dependency"