Merge "Remove ARCH_ARM_HAVE_NEON dependency from arm64" am: a087d3f394
am: fdd8120581

Change-Id: Ieddf1e83e4801968d86c675f89fa89915b6630db