am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]

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