Merge changes I90693fb4,Ibb3d4c77 into main

* changes:
  aosp/android-mainline: fixup Kunit tools patch into tools commit
  aosp/android-mainline: update series (rebase onto v6.7)
tree: 05cc5241980a6b114b77ba52f4fecd8780d42040
  1. android-mainline/
  2. scripts/
  3. OWNERS