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

Change-Id: Id2422881831785eb9a47fda38b3fe6ce95b843cb