Merge "android.hardware.media.omx@1.0-service is not using libgui"