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

Change-Id: Icc9c151e0004a646e4163cd3362b64776c6aa053