Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev