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

Change-Id: Ia0b18251c6b4fada4a1ae11400551b0b2936eb1a