Specify map destination for tsk_jni build
Merge remote-tracking branch 'upstream/master' into new_tags_api