Merge "Add TEST_MAPPING to system/netd"