Merge "Enable runtest.py .../netd_unit_test.cpp"
am: 4d2f32538c

Change-Id: Icb31eed4c3e47589d7adab44d514cfef96842e9b