Merge "Move adsal into its own subdirectory."