Merge "Fix coretests: Remove dependency on libnativehelper"