Merge "Delete net_test from system/extras now that it's in kernel/tests."