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

Change-Id: I4fbcbdd7e845f2ce7106a85ce8224c17517db1f5