Merge "Update the variable type to DrmStatus in libmedia_jni"