Merge "Strengthen annotation-related checks in JNI code." am: 4c368264 am: 411d6eb8 am: ff6eb05c am: 108c7ec6 Change-Id: Iaf29368eb6e6a7bf46e7650a0969c9ff9028f176