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

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