Merge "Eliminate dependencies on hardware/audio.h (trivial cases)"