Merge "audioflinger: conform inline ASM to UAL"