Also fixes where two style names were accidentally switched, makes the font sizes larger, and cleans up the CaptionTextView styling APIs in preparation for moving it into the framework. BUG: 10396663 Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c