Switch frameworks/av to cherry-picking

Less things to maintain