Merge "Remove dependency on libnativehelper/JniConstants.h" am: 7fbba6bbbc
am: ee58446d3e

Change-Id: I415dd08b276f808e7c1af4582afa28e9da886276