Make the build work with 6.1 sdk and clang for armv7