Merge "Use shared library variant of libnativehelper" am: 3f7367a17e

Change-Id: I629f999e136943790c72237f8e10fe917d6b08af