Update to use core/Makefile 4.3_r2.1