Merge "Rename audio hal service"