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

Change-Id: I12519726e6f3969f49f49efb67b1a04f363f28b6