am e0b8cf31: am d5deafa4: Merge "Fixes to FlpHal JNI layer." into klp-dev

* commit 'e0b8cf3141dd68afd9efafb86ccdbb18295fab59':
  Fixes to FlpHal JNI layer.