Merge "Add surfaceflinger owners." am: cbc27c4bbd
am: 5a68696e0f

Change-Id: I901ed047ef3780e35caa75905784daffc6a067c6