am 0fc85731: (-s ours) am 1333694c: Merge "system/audio.h: Make function inline"

* commit '0fc857318c8584db8fd927b42265fa488ee20964':
  system/audio.h: Make function inline