Merge "Remove spurious cflags from AudioControl HAL 1.0"