[automerger skipped] Merge "Add /mnt/vendor rw mount point for vendor partitions." am: 4640149fd5
am: 9c0825051a  -s ours

Change-Id: I83df823844623d1d8c20fc3db91ebac18f40f81f