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

Change-Id: I726742d6a27eed263ec025dfc1976fcc3677ea2a