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

Change-Id: Iddaef24f1a3b94a285631bb84bd1e47cefd7054b