am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb

* commit 'a324a5810c84596d3a4f67f81a725a0c98dfc30f':
  Fix for StaticLayout bug with ellipsized text