Merge "audiopolicy: apm: factorize internal patch creation/release"