Merge "update action bar guide for support lib ABC" into jb-mr2-dev