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

Change-Id: Ie418def364cdff53ba02a07d9979f10dcd819698