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

Change-Id: Ia6bdc86891d66b1620d36cc4c6dc906913a55518