am 410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev

* commit '410e2df458328d5375b35ef9a610da240293d06b':
  CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.