--disable-tools actually working

Change-Id: I83bd3e4c35d2a250b61626aa826b473c5d6edd14