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

Change-Id: I02a49f1207899cf0153e1aa9649e105372117e25