Change-Id: Icc1bce28b78c4da2d529c308f251e298ea94539f
Change-Id: If8109c6aa29d100eb745f17f0af756bcb6e3cabb
...and also rename the new one into "makedict". Bug: 5151604 Change-Id: I44a8ab640d408f630f20f502787a967791796dc6