Merge "fix(corstone-1000): add cpu_helpers.S to platform.mk" into integration