Merge "Fix typo in android_media_AudioSystem." into sc-dev