Merge "Add surfaceflinger owners to libgui OWNERS"