Merge "allow adb to remount symlink mount points"