Merge "Strengthen annotation-related checks in JNI code."
am: 4c3682649e

Change-Id: I2ebff3219cf64d5faa0a90d949910d8508f46da4