Merge "Fix dicttool build"
am: a92d0f9262

Change-Id: I154c551c433cc8ef4a17268d57429e38ab962be0