Merge "LibNativeBridge: Fix two bugs"