Merge changes I7ecd9cfa,I80ce258d

* changes:
  Revert "Switch the framework AIDL to use AudioChannelLayout"
  Revert "Rename AudioGain.useInChannelMask -> isInput"