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

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