Remove some dicttool dependencies

Bug: 18108776
Change-Id: Ic81c5df2a685160c249021ff4cfe41553dbdeebe
2 files changed