Merge "Fix build - Add TARGET_ARCH := arm"