am 8ed784e2: am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev

* commit '8ed784e2893c79d943b6184d25167ecf72a9a9ed':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]