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

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