Merge "Try to preserve dex pc better in vector code."
am: 85eda8b927

Change-Id: I71b395a54003e40d002412f8b45840d524f2872f