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

Change-Id: Id99fcf0d421f1cb47b173154af5b61941ccb7dcb