Merge changes from topic 'recordingcallback'

* changes:
  Audio recording notification API
  AudioManager event dispatcher: make more generic

diff --cc core/jni/android_media_AudioSystem.cpp
Simple merge

diff --cc media/java/android/media/AudioManager.java
Simple merge

diff --cc media/java/android/media/AudioSystem.java
Simple merge

diff --cc media/java/android/media/IAudioService.aidl
Simple merge

diff --cc services/core/java/com/android/server/audio/AudioService.java
Simple merge