Revert "temporaryily use caf-rebase audio branch"

This reverts commit 78888d8672cc421f99ecceef4ddf074acc15261f