Merge "Fix fastboot dist to be compatible with adb" am: 9e8e19a722
am: 504696f5c2

Change-Id: Iaeac60d53e6d79ab1357c44a7e846409f3e9c16c