Revert "Merge pull request #1076 from drinkcat/cras-version-master-fallback"

This reverts commit 8f33bd231245d73621bc69583759f8635983ac8a, reversing
changes made to 4b8c6ecfe934bc475a878385c470a59f02be115b.
Merge pull request #1097 from drinkcat/revert-1076

Revert "Merge pull request #1076 from drinkcat/cras-version-master-fallb...