Merge "update all links to the support library" into jb-mr2-ub-dev