Revert "fixing problems with frameworks/av"
This reverts commit 68774e0.