Merge "Fix typos in LinearLayout comments" into jb-mr1-dev