Merge "Move JniConstants from libnativehelper to libcore"