am 860f98af: am 327b2b70: Merge "move core audio definitions under system/core"

* commit '860f98afe175667d2f72f7a5e8b1bf58bfdf96ea':
  move core audio definitions under system/core