Merge "Fix the stack at the beginning of the Generic JNI trampoline."
am: ab6daee483

Change-Id: Ic09aa8ff93cb90c7fe750c1445f0dd6e124a8c35