Merge "AudioFlinger: timing code build cleanup"