Merge changes from topic "vndk_jni" into oc-mr1-dev am: 6f7d928940
am: 25a03a23a8

Change-Id: I0ed0b84e9d199f4dbbbc936681a2b7657533f326