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

Change-Id: I2e446c7efac013ef693e89db56143fed6cbb207e