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

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