Merge "Fix fastboot dist to be compatible with adb"