Merge "allow adb to remount symlink mount points"
am: 4eb864bf7d

Change-Id: I4fd9b9b9ec4a05a266a92fedf429d61394b15d38