am 966504dd: am f001f5f5: Merge "Fix build - Add TARGET_ARCH := arm"

* commit '966504ddd2905a3eb92b120579114447af996ff6':
  Fix build - Add TARGET_ARCH := arm