Make audio HAL consistent. am: 63bf69427b
am: b113dd06e0

Change-Id: I54fb41970f8a0655bca573ed67e3c4304771c50c