Merge "adbd: cleanups in remount/verity."