Merge "move core audio definitions under system/core"