Merge: A little fix to android::audio