Merge "Fix/suppress hwui/tests google-explicit-constructor warnings" am: 6832595911 am: 0e0edd08ac
am: c545d54389

Change-Id: I6a074df93a9eb22ec2da81f91826f699989ff988