Merge "Add TEST_MAPPING for system/core/rootdir/etc"
am: ebadad5c56

Change-Id: I1ffd33039ffd4048f4b82cd30354096217377602