am c0b540dc: am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db

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