Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]"