Merge "Fix coretests: Remove dependency on libnativehelper" am: f68cb55cc1
am: 6a5e1a7f4a

Change-Id: I096fb9b30c2e11bf7054aefa1bd3deb6974a9d36