[automerger skipped] Merge "Statically link to libnativehelper" am: 6ee38c5a...
[automerger skipped] Merge "Statically link to libnativehelper" am: 6ee38c5a am: 5b5e542c am: 794f5eda -s ours
am skip reason: Change-Id Ia3c27416808bc9c53f4c501710cd4aaadfecbfe1 with SHA-1 5459601c is in history
Change-Id: Iff3a04f3f1707dcf735fe476fc2da3ee40919df6