Merge "Fix/suppress hwui google-explicit-constructor warnings" am: dcfef16295
am: 50991469e3

Change-Id: Ic97c02ca4f0f903e3e9c861b4dd605ce0b7c1905