Merge "Add libnativehelper.so to public libraries"