Merge "Fix google-explicit-constructor warnings in surfaceflinger." am: 5e703a6ad0 am: 101b4cc9d7 am: 32db2f3c9f
am: 9a9816ad3f

Change-Id: I5766b8b9adb236795cc7c8449d97b6c300512623