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

Change-Id: I03ba9fb1e41537a2e058c3375d0698b9699d955f