remove cherry-pick conflicts
added '=' sign to 'CROSS_COMPILE' within Makefile