Merge "Update android.media.AsyncPlayer test"