Merge "API REVIEW: android.view.accessibility" into jb-dev