Merge changes from topic "aidlize-aps"

* changes:
  Convert IAudioPolicyService to AIDL
  Small changes around AIDL conversion code