Merge "Fixes for run-test 656-annotation-lookup-generic-jni."
am: 67380d6ff6

Change-Id: Ic9456ac52ef4f4650c46ab3d81fc24d9ef4ddc0b