Merge "Make AudioManager.adjustMasterVolume public and hidden" into ics-aah