Merge "Revert "Add TEST_MAPPING to system/netd""