Update Android binaries, add armv7 versions, update makefile