Merge "Add audioserver UID."
am: c57c622e76

* commit 'c57c622e7687ea82ab1de7581b27f068ebe3a9ad':
  Add audioserver UID.