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