Merge "remount: Remove AVB 1.0 code & opaque exit code"