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

Change-Id: I1f31bfd602f3bfaf7f0c97068a8a2257bd0abea5