Merge "envsetup.sh: partly fix syswrite" am: fe9de6798b am: e5ee7281e9

Original change: https://android-review.googlesource.com/c/platform/build/+/2192201

Change-Id: Iabc5386d3969b010859eac20a4b630e638319250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

envsetup.sh

@@ -1069,7 +1069,7 @@ function qpid() {
 # Easy way to make system.img/etc writable
 function syswrite() {
   adb wait-for-device && adb root || return 1
-  if [[ $(adb disable-verity | grep "reboot") ]]; then
+  if [[ $(adb disable-verity | grep -i "reboot") ]]; then
       echo "rebooting"
       adb reboot && adb wait-for-device && adb root || return 1
   fi