Merge "MediaPlayer2: replace IPCThreadState with libbinder_ndk."