...and also rename the new one into "makedict". Bug: 5151604 Change-Id: I44a8ab640d408f630f20f502787a967791796dc6
The corresponding change is I559207ab Change-Id: I01ef7084cffa72468e87147e0ec7a9b16dd19990