Merge "Fix google-explicit-constructor warnings in surfaceflinger."
am: 5e703a6ad0

Change-Id: I758fe34b9d89c5d2c343830d6521b7b2217cdbde