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

Change-Id: I3de7abeb4b4859f63ebf4efcb549cbcc0d3c5729