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

Change-Id: Ib51ba2a7a5e02ee9f5211c16913af5edede48e15