Sync with upstream.
Fixup: forgot to update Makefile
Possible NAUDIO_02B0 fix