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

Change-Id: Ia3353280f106dffd16a4cbdfc05ce110c23fb086