am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db

* commit '2c6b048bed296949878318a7c60faf247f538e67':
  jni: Resolve build warnings
  jni: Incorporate liblog reading API