am 28c284f2: am 9fbe946f: Merge "Fix JNI compiler frame size adjustments."

* commit '28c284f29f8659afe47c426aad6c075cf3e3e05d':
  Fix JNI compiler frame size adjustments.