Merge "NuPlayer2: fork the native code for MediaPlayer2"