am 70cd6886: am fb45a2e9: Merge "Fix layoutlib build" into klp-dev

* commit '70cd68869d04b56883a8d2fa34f0468d730f227d':
  Fix layoutlib build