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

Change-Id: Iadcc66e61a177169661745f13f88e344f4138039