(a) jni static methods take 'jclass clazz' as 2nd argument, while non-static methods take 'jobject this/thiz/self' (b) use a macro for error handling to remove duplicate code (c) also fix some whitespace Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I2773617dc7129efb87e28266f97ec3e01a35efc3