am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"

* commit 'd83ffe358db81abbde44ec38cd9121e67d25fbb3':
  Add missing dependency in layoutlib build file [DO NOT MERGE]