Merge "Wait for ANRd process to be killed before starting next test"