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

Change-Id: I3c84d26e2dfe2aa69a2dcc60fd4ca6bfb1437904