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

Change-Id: I8199a26c717fe80b3a733d796b85f28d3acc25a9