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

Change-Id: Ia12365bee347e8a37517941358c327d9273539b9