Merge "Fix JNI compiler frame size adjustments."