am 548101cb: am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

* commit '548101cb96fbc855d4257d46841b2959fe4c9ce4':
  Fix android_media_AudioSystem_getMasterMute return type.