Merge "SurfaceFlinger: update OWNERS" am: 9305f34da2
am: 1191d131e4

Change-Id: Iec6d321889a14a009d324757d2f49316ca6019e2