Merge changes I25e04151,I22d555d5 into main am: 9cbd7c274b

Original change: https://android-review.googlesource.com/c/platform/bootable/libbootloader/+/2984061

Change-Id: I7e306fc63f9fded57165d7d2cfd43eb1fbf69afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: bbc7b45a3600f95998c4eb81b1543107a20c9c35
  1. gbl/
  2. libxbc/
  3. vts/
  4. .gitignore
  5. BUILD
  6. OWNERS