Merge "Update make file for new driver loading."