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

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