Merge "Make resolv_stress_test run as root" am: 268a55184f am: 5419167d2a
am: 7a7bb572e0

Change-Id: Id0585b574e27afdcafd119b19771bfa5a3dd0207