Audio V4: Move service entry point to common am: 2696030063
am: 2c8c4f7c7b  -s ours

Change-Id: I0fe41701a109e7ab957637d188e939eaa394f99a