tree 30ba47ce86bd06dfb964fc34209e22b19782ec74
parent c42acc5344c4220af80d40eb33026c840e738492
author Tadashi G. Takaoka <takaoka@google.com> 1540452246 +0900
committer Tadashi G. Takaoka <takaoka@google.com> 1540796345 +0900

Fix dicttool build

This CL partially reverts
  - Id88b02b74bdfe4ca05b08181ceb6b34d5652fc0c
  - I05c7d8429e8d9a26139456763c77997340fea8c2
And followup (remove shortcut support)
  - I73b7dc008a5acaf75a31a36a2d332b5afabd82d0

Bug: 28255684
Test: make -j10 dicttool_aosp
Change-Id: I2e01ed86b9517a1141aee35ea6d8ef39258981d1