Merge "Fixed wrong package names in samples hello-jni and two-libs"