Merge changes from topic "libbinder-am-split"

* changes:
  reflect libbinder/am split
  audiopolicy: reflect libbinder/am split