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

Change-Id: I0340acdbd6530f9bd9f67333974bcc65ff97e0e5