Bug: 6188977 Change-Id: I1d82479dc6b678c68835f0a291570f86fe879f5d
Change-Id: Icb8427c82694e24c8d08a5376157c7d1444af979
...and also rename the new one into "makedict". Bug: 5151604 Change-Id: I44a8ab640d408f630f20f502787a967791796dc6