Merge "Fix/suppress androidfw google-explicit-constructor warnings" am: 392f0052c2
am: 99a3d72b98

Change-Id: Icb12400292dae8ed091f1a55eb2f0a7e50e84667