Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am: 1a9def3dc7" into pi-dev-plus-aosp