Merge "libmedia_jni: map drm MediaError to Java error" into sc-dev