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

* commit '6893c9ecc57e2939477eec785626368b1dc66c04':
  Fix build - Add TARGET_ARCH := arm