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