am 925abb6d: (-s ours) am 891f38d1: Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev

* commit '925abb6d983aef0016b5828349d53cc5a11ebad8':
  Build layoutlib create tests as part of sdk build. [DO NOT MERGE]