Merge "Statically link to libnativehelper" am: 6ee38c5ac2 am: 5b5e542cac

Change-Id: I1ba402dc7a8b6cc3340ed7e6af39d74abadc3c29