am 48dea806: Merge "Fix build - Add TARGET_ARCH := arm"

* commit '48dea806820cea16f16df24c6d9fe740381b6507':
  Fix build - Add TARGET_ARCH := arm