Merge "Fix/suppress libs/gui google-explicit-constructor warnings"
am: b0a8291275

Change-Id: I860d5190391059d3078fb44f63dab4310ef12e8d