Merge "Pass the Java caller's location to OpenNativeLibrary." am: ad6a5c565c am: 52ee675449
am: 18d145c45c

Change-Id: I15128358d665f645dba4042bde36b95e36ca4be0