Revert "G3:dtbtoolCM becomes dtbtool"

Change-Id: I5e0dcf1694a229b3a7eb218e569ba3973cbfff5c