Merge "Update references to build/core to build/make/core"