Merge "Build armv7a-only code"