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

Change-Id: I418d980c1235ca747049feb710acc6a9e6ccea84