Merge "Add defines for audio offload and non-blocking write"