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

* commit '2d687fe3d8af29e79ee13e5d6c3d71113d6f575a':
  LibNativeBridge: Fix two bugs