Merge "Remove dependency on arm_neon.h"