Merge "audio policy: update from libhardware_legacy"