am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev

* commit '04b4f8d11406c64b94797af67dd7530435187129':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]