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

Change-Id: Ia6dae72a882e4f5298df3b9895a396ef4dcb0093