am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev

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