am 86f3922c: Merge "Remove never used SocialProvider and activity table" into jb-dev

* commit '86f3922c73cc76a8b69b341dcd098517bb55837e':
  Remove never used SocialProvider and activity table