Merge "Remove ARCH_ARM_HAVE_NEON dependency from arm64"
am: a087d3f394

Change-Id: I62133603163be7541d763e59c27db90f0b63292c