Merge "Fix warning about recursive loading of libmedia_jni.so" into sc-dev