Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev