Merge "surfaceflinger: Update OWNERS" am: 2c9ea71904
am: c5f43afca8

Change-Id: Idbd8ba3d21c0ed476585d04108911f6a5f805ebf