Merge "Use shared library variant of libnativehelper"