[automerger skipped] Merge "Statically link to libnativehelper" am: c4140ab6...
[automerger skipped] Merge "Statically link to libnativehelper" am: c4140ab6 am: d6d40011 am: 1a178f8d -s ours
am skip reason: Change-Id Ia3c27416808bc9c53f4c501710cd4aaadfecbfe1 with SHA-1 23035588 is in history
Change-Id: Iff3a04f3f1707dcf735fe476fc2da3ee40919df6