Merge "Add missing aapt2 dep in appcompat-files"