Merge "Revert "media: remove IGraphicBufferSource.aidl""