Merge "shim libraries for libnativeloader and libnativebridge" am: 4b6b7b6715
am: 074f836c74

Change-Id: Icfd3466cc72849a8593d6e316a30d21b7cddd5a0