Merge change I48cbd0bc into eclair

* changes:
  remove the SubscribedFeedsProvider since it has been moved to vendor/google