Merge "Mount vendor overlay from the system partition" am: 312339167e am: 84bbc22fe8
am: 22fe18b73d

Change-Id: I5924f70a125af2d868fd566574d5d7dc7a5bd2b3