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

Change-Id: I9d3b557784f806c5892a81bc7173c93e54ef83f4