Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev