Merge "Fix incorrect inheritance from TextAppearance to Widget." into nyc-dev
am: 614c83d977

* commit '614c83d9777b68b304e0fac6ac19e39a4d49d016':
  Fix incorrect inheritance from TextAppearance to Widget.

Change-Id: Ifdce3f9fa8d3be08b7de6c5afb2d1a74b0437188