Merge "Track some audio repos from CM" into kitkat