am 7423fb53: Merge "Restoring mLayout has private in TextView"

* commit '7423fb5352c3e02979f653267974b5de5c4f90c7':
  Restoring mLayout has private in TextView