Merge "usblib: fix race & delay waiting for perms on open" am: 255c43cd05
am: 20346c2336

Change-Id: I2eedd990038860131928b7154133ae08a14f96ef