Merge changes I3659193f,I8b78e4db

* changes:
  jni: Resolve build warnings
  jni: Incorporate liblog reading API