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

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