Merge "Add armv7-a-neon build target"