Revert "switch to CM frameworks_av"

This reverts commit d581cc0783db9aae3c780e23e0ee9a558e6d17e0.