am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1

* commit '2ddf6ea6dc67043fb9f91df366187c2153c30d30':
  Fix issue with selecting proper JNI libraries