[automerger skipped] Make audio HAL consistent. am: 63bf69427b am: b113dd06e0
am: 5eb6bc134a -s ours
am skip reason: change_id Ie125d9bb014ee747ce56a59feaca577ab2d9e96c with SHA1 7a0e3d17d4 is in history

Change-Id: I20535a12e928439554e5dbd88ae23773cf7c1323