am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

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