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

Change-Id: If101e643188d2d51ca12e2995bfbfde9a369132f