Merge "Revert "Disable flaky 130-hprof test.""