Merge "Fix a typo in LOG_TAG for MediaPlayer unit tests"