Merge "adb-remount-test: Make awk scripts mawk-v1.3.3-compatible" am: de5ac631bd

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1722716

Change-Id: I5fbe9f9842e2f8a45875663bbe8b9a735fd7da31