[automerger skipped] Convert audio HAL service mk to bp and rename the service...
[automerger skipped] Convert audio HAL service mk to bp and rename the service am: ad17f58e am: 42f11a94
am: 2ef1b4dc -s ours
am skip reason: change_id I25f41735175a6687a051ca1e5a7fee670eb8115e with SHA1 de7d06ba is in history
Change-Id: I0d23f1bf7c3ca54d085e84f6823bd59b84070a6a