Merge "MediaPlayer2Impl: avoid NPE when accessing mHandlerThread"