Updated for usage with armv7 only projects