am 8af2a13d: Merge "Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams" into jb-mr1-dev

* commit '8af2a13d038002522c2f4e5d65bd703db9f86a08':
  Fix bug # 7172247 API REVIEW: android.view.ViewGroup.MarginLayoutParams