Merge "Update Makefiles Missed In Previous Commits" into pi-dev