Merge "Add TEST_MAPPING for system/core/rootdir/etc"