Merge "Fixed makefiles for loopback jni files" into nyc-dev