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

cc_test {

    name: "resolv_stress_test",

    test_suites: ["device-tests"],

    // This won't work with test_config

    // require_root: true,

    test_config: "resolv_stress_test_config.xml",

    defaults: ["netd_defaults"],

    srcs: [

        <option name="cleanup" value="true" />

        <option name="push" value="resolv_stress_test->/data/local/tmp/resolv_stress_test" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />