Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev