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

Change-Id: Ifdbe16b834532e29116aaef55b22c38472ed350b