am f6cfdf45: Merge "Close adb_usb.ini after reading it"

* commit 'f6cfdf4552b9c0fab3512fbd40bd971849e5173c':
  Close adb_usb.ini after reading it