Merge "fix SDK build breakage with NEON" into klp-dev