Merge "audiopolicy: Convert some of .mk files to .bp files"