Revert "getting desperate trying cm frameworks/av and native"

This reverts commit aaaed1b1f2f863aaa697c012d3aa8b8ccf212c45.