Merge "More AudioPolicy registration" into lmp-mr1-dev