Revert "Adding tests for multiple provider support in AbstractMa..."

Revert submission 17008428-cherrypick-multi-provider-cloudsearch-2yrjp5zxz1

Reason for revert: Broke TextToSpeech service
Reverted Changes:
If1d0ac733:Adding tests for multiple provider support in Abst...
I1da7f54bc:Adding multiple provider support in AbstractMaster...

Change-Id: I22cfed8847e4df885185fd5bb90cf691205e4dfb
(cherry picked from commit c4e5c8930716902464f25f929177ce27b9840651)
Merged-In: I22cfed8847e4df885185fd5bb90cf691205e4dfb
6 files changed