Restore TEST_MAPPING files removed during repackaging am: 51931e2522 am: 9fd111d6eb am: b4db485d2d
am: 7c37827127

Change-Id: I33101a3d51c9e7d50952e535d46d1aef357665cf