Merge changes Ie59cdd64,I35e5c83b

* changes:
  Switch the framework AIDL to use AudioChannelLayout
  Refactor AudioIoDescriptor