am: 96ace24b * commit '96ace24b': Clean up JniConstants Change-Id: I298049158b2b63bb9fe4db8c1b95a4503d0d2adc