Merge "Changed sun_coding_style.xml to have 120 line wrap instead of 80"