Merge change 5145

* changes:
  Remove "ifneq ($(TARGET_ARCH),arm)".