Merge "Revert "Remove stubs for libnativehelper.""