Merge "Revert "Remove non-live vregs from GC map on return."" into dalvik-dev