Merge "Use module name as the suffix for apex variant" am: 22b08b4af6

Change-Id: I5378d6c9ecda93e361fd31b3684017e755508b22