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

Change-Id: Id8314f9aa06aca7d688a30c19e3f6390cba48392