Merge "Move JniConstants from libnativehelper to libcore" am: 9684d3fc53
am: 3d70f9ca68

Change-Id: Ia71fcc0ded674ef2e5531083fad409ad168c402f