Merge "Fixes for run-test 656-annotation-lookup-generic-jni."