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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base