Merge "Fix non concurrent GC ergonomics." into dalvik-dev