Merge "Use and test patch utilities from system/audio.h"