Merge "Use AUDIO_INTERLEAVE_* constants"