Merge "Fix issue with selecting proper JNI libraries" into ics-mr1