Merge "Rename tool's name"
am: 08ac866859

Change-Id: I54985b31038b17d002a1dd6ad65616275ad1575a