Merge "Fix bugs regarding TextView layout size with large font scale in ScrollingText" into kitkat-cts-dev am: 54f86cdc66 am: 602ea9bedd am: 8e3c0d3bfb am: 95bcb1915d am: ce38377237 am: a5a3107b26 am: adade48b09 am: d8ee6a8021 am: 74e113baa8
am: af70bc3294

* commit 'af70bc3294ef2287e2a0027d31ef2bd77fde3ccf':