Merge "Add smoke test for jni library" am: b0b166054d
am: 6a9b888b52

Change-Id: Iba607c906917017f79f141f4e0599a2330cc0f14