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 '36f8cb3e0850ea8e3d195d8c78676492fb26da2c':
  Add missing dependency in layoutlib build file [DO NOT MERGE]