Updated to support armv7 and armv7s architectures.