Go back to du.mk etc

Change-Id: I868c3aac6aee13f52930d6ac716a170d5c5ff0cb