Merge "Correct verifier merging of primitive arrays" into dalvik-dev