Merge "shim libraries for libnativeloader and libnativebridge"