Merge "Convert jni files from C to C++"
am: 97d5507416

Change-Id: I30fe652b0e8a56594c7c569f7dcc9a5cd12b5748