Merge "Don't add .vendor suffix for vendor-only modules" am: 28989a9a22 am: 8f793af35c am: 739ce549ae
am: da86c362ce

Change-Id: I2cb0760dd7fb381ce4d386b66f587c67914d0452