Merge "Use armv7-a when building sdk."