Merge "Disable 130-hprof test on asan." am: 416ed78d28
am: 4ecdcdcda2

Change-Id: I9f311e9fbcac616979690c0a99b3a4f727b43adb