Merge "Fix/suppress aapt/aapt2 google-explicit-constructor warnings"