Revert "fixing problems with frameworks/av"

This reverts commit 68774e01ba5cdeb33574c0296a49c2d3648b4398.