Revert "Switch to androidarmv6 frameworks av"

This reverts commit 2afd55b7e3235696dbead7a16653005c88789c27.