Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev
am: 2ed861d560

Change-Id: I0097c1a6ab90fe1e9085c36b2777a708ea616403