Merge "Fix problem with audio policy configuration file."