Merge "Fix duplicate checks in JNI macro assemblers."
am: 2af1aa066e

Change-Id: I658e24a12a0086257acfa5ec88ffb91d2d25f03d