Merge "Update the format of module variant dir name" am: cfeef5f41c am: 568a6c00ac am: 9a8af1c45f

Change-Id: Ib68df7e2c14f5500ef73a39bd3c288a555f1d4e2