Refactor NativeInterace to wrap static native function as public non-static function am: 26337ca3e1
am: aed30c90cc

Change-Id: I38ed0d9dac0b1c0bea55c85f73c0268e62d5f4f0