Merge "Catch nullptr possibilities in MediaExtractor jni code" into udc-dev