Merge "Fix/suppress androidfw google-explicit-constructor warnings"