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

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