Merge "Fix up the makefiles and some samples."