Merge "adbd: cleanups in remount/verity."
am: 98efc485de

Change-Id: Ideadb9d6633d5529710932e849bdf3a4bc9a9999