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

Change-Id: Ia76a004460bb6bc257c00f515d47fd353a79cf99