Merge "media: remove IGraphicBufferSource.aidl"