Merge "Show install path in "adb --version" and "fastboot --version"." am: d2d8b68f70 am: 8aac990de2
am: dd05434457

Change-Id: Ibc945b167cc59fa744c4516021b946ab96fa69f3