Merge "Remove last references to hardware/audio.h"