Merge "Revert^3 "Remove stubs for libnativehelper.""