Merge "android.hardware.media.omx@1.0-service is not using libgui" am: aba76c0dbd am: d6285f6bf4
am: 9d5b41ac3e

Change-Id: Id90b92c2d6c97337fdddb5c5df23eb39f8738d1a