Make --disable-tools effective

Change-Id: Iba7371e85e1fdb17c0be5b364cbfcb9e3a5c47f9