Merge "Fix/suppress surfaceflinger google-explicit-constructor warnings"
am: 0c667f03ef

Change-Id: Ic4266667f2d2b09e753be3e2ed27d04b99e9fcf0