[automerger skipped] Merge "Add smoke test for jni library" into qt-dev
am: 47159d969f -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1 5f8a630da7 is in history

Change-Id: Ib3f66d33a54be4216c098e2cde2023ece3fbf41e