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

Change-Id: Idd65d4547d77062f7dca9b0533186d7b2159bda5