Merge "Make the native bridge API a C API." am: 108ab211fe am: 5a2098afa0
am: 480a3fcc64

Change-Id: Ic22aa780b7f0d1ce236bee658cd78370e1acaa6d