Merge "Update makefile." into udc-dev