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

Change-Id: I449cd9a5ceabb13abce3a5d345137025fca33579