Bug 973666 - Remove unnecessary TwoLineRow view (r=margaret)

--HG--
rename : mobile/android/base/resources/layout/two_line_row.xml => mobile/android/base/resources/layout/two_line_page_row.xml
Bug 973666 - Rename TwoLinePageRow.Description style to TwoLinePageRow.Url (r=margaret)
Merge mozilla-central to fx-team
Bug 963835 - FxA client handle incorrect capitalization in emails. r=rnewman
Bug 974370 - Remove unused OS/2 strings from unknownContentType.properties. r=dolske
Bug 960146. r=kats,wesj
Merge fx-team to m-c.