Merge "Miscellaneous updates to <system/audio.h>"