Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev