Merge "Add presubmit test for vendor overlay" am: 024e442812 am: ba69d077f1
am: 7790ce5f7e

Change-Id: I5f87acb41d71ca0555b6e0cd82aa039c73ae92bd