Merge ICS_AUDIO patches from AOSP-Plus
 https://github.com/Pure-Aosp/android_frameworks_av/commit/4dbaeac1d79563a11892146016219cba2f02dce9