* commit '37d66f3bccdde61517308b8d034484abbe82c36b': Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. Revert "Initial draft of new MediaRouter APIs."
* commit '37d66f3bccdde61517308b8d034484abbe82c36b': Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS. Revert "Initial draft of new MediaRouter APIs."