Merge "Make the native bridge API a C API."
am: 108ab211fe

Change-Id: Ice7b64b90e449f0ee9ee4606d5ba3796f1dbaafc