am 72b2f536: (-s ours) am 76c484de: am d93b0b67: am e448bcf7: Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" into klp-dev

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