Merge "Add ExtServicesUnitTests to device-tests.zip for Test Mappign Suite."