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

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