Merge "Revert "Build support for 32-bit armv8-a""