am 22e91366: Merge from AOSP staging branch

* commit '22e9136661f55122d4ed4b081f61fd63e9ce3685':
  libusbhost: generates a static library
  libusbhost: permits client polling on inotify wd