Merge "Common code for 4 jni Location conversions"