import from platform/device/generic/armv7-a-neon, small changes