am 9f93e297: Merge "LibNativeBridge: Fix two bugs"

* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
  LibNativeBridge: Fix two bugs