Merge "Hiding some of the deprecated android.webkit API's" into jb-mr1-dev