Merge "Remove dependency on libnativehelper/JniConstants.h" am: 8d7f7a4ada am: 107a8e7582
am: 227c8c2fae

Change-Id: I3838a44b8eae2c29df5f6ac068dfc0b18eba3888