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

Change-Id: Ib15a78a7745a012ce91ffbfc550cf4f5410c784a