Merge "first stage mount: support mount points like /vendor/abc" am: edaa28771f
am: 72db512c47

Change-Id: If2b87176342fa4d999ed5b5cc19179f489576bd1