Merge "Fix/suppress surfaceflinger google-explicit-constructor warnings"