Add vabc flag to UpdateAttemptReported / SnapshotMergeReported. am: bab11c59e6 am: edbce76339 am: e87f01971f

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1573035

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb8801c2aa6f45bf5f57751c2b04ab980c2e07fa
diff --git a/scripts/brillo_update_payload b/scripts/brillo_update_payload
index 439a42a..efe080c 100755
--- a/scripts/brillo_update_payload
+++ b/scripts/brillo_update_payload
@@ -89,12 +89,14 @@
   exit 1
 }
 
-# Loads shflags. We first look at the default install location; then look for
-# crosutils (chroot); finally check our own directory.
+# Loads shflags. We first look at the default install location; then our own
+# directory; finally the parent directory.
 load_shflags() {
   local my_dir="$(dirname "$(readlink -f "$0")")"
   local path
-  for path in /usr/share/misc "${my_dir}"/lib/shflags; do
+  for path in /usr/share/misc \
+    "${my_dir}"/lib/shflags \
+    "${my_dir}"/../lib/shflags; do
     if [[ -r "${path}/shflags" ]]; then
       . "${path}/shflags" || die "Could not load ${path}/shflags."
       return