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

Change-Id: I43204ec63b34e7a2f52472946300176ea495e2c7