Make audio HAL consistent.
am: 63bf69427b

Change-Id: I47101a03d8598b415336b2fa7f9b4ead084c5ba2