Merge change I31dbed7b

* changes:
  Add adb's ANDROID_SERIAL to fastboot too.