am 500fe4f7: am 4f78d17a: Merge "Fix build - Add TARGET_ARCH := arm"

* commit '500fe4f708230dddf72c9357111709def329b40e':
  Fix build - Add TARGET_ARCH := arm