Merge "Update makefiles"