Merge "Fix/suppress hwui/tests google-explicit-constructor warnings"