am 629daddd: Merge "Fix layoutlib build."

* commit '629daddd03b598616de7c30a13b1f9f9b11b98fe':
  Fix layoutlib build.