Update build files to use layout v2

Test: Presubmit builds + ABTD
Bug: 2716535
Change-Id: I7de6127e0cc779011a64b239c238146a10756da3
diff --git a/buildSrc/lint.xml b/buildSrc/lint.xml
index 749708c..1eaf525 100644
--- a/buildSrc/lint.xml
+++ b/buildSrc/lint.xml
@@ -28,7 +28,8 @@
         <ignore path="**/src/test/**" />
         <ignore path="**/src/androidTest/**" />
         <!-- Required for Kotlin multi-platform tests. -->
-        <ignore path="**/src/androidAndroidTest/**" />
+        <ignore path="**/src/androidInstrumentedTest/**" />
+        <ignore path="**/src/androidUnitTest/**" />
         <ignore path="**/src/jvmTest/**" />
         <ignore path="**/src/commonTest/**" />
         <!-- Required for AppSearch icing tests. -->