Merge "Statically link to libnativehelper" am: 6ee38c5ac2

Change-Id: Ib8f9cac643a37af1b7214a77f16423f8b9f8ab81