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

Change-Id: Ide74203d4a844e06c6f1e7720b4a15e8f9363746