Merge "adbd: fix check of `remount -R`." am: d81c4f07fb
am: c2553602b3

Change-Id: Idc5743904b29a450af780c799e312fde07c128cc