Merge "Audio V4: Synchronize the devices between the policy XSD and .hal" into pi-dev