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

Change-Id: Ife6501f466171fe5b1e05effa0527210e1bdb3e5