am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."

* commit '4770c79c340c2fb5b6b58c0a1ccf8aac96138ef6':
  Tweak audio APIs for better forward/backward/sideways compatibility.