am 0505f4ed: am 5bb2ca8d: am 36f8cb3e: (-s ours) am c1172273: am 2f7d5d7c: am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

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