Merge "make libmedia_jni_utils depends on libgui"