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

Change-Id: Id5eef00a490e971b025937c34b372cd272c72087