Moves ash/wm/common back into ash

ash/wm/common/always_on_top_controller.h

Index: ash/wm/common/always_on_top_controller.h
diff --git a/ash/wm/common/always_on_top_controller.h b/ash/wm/common/always_on_top_controller.h
index f57a42a2d9511ba0d87d1b22b60eb44d4116df3e..dd990b2ab48892836e3ddf958b9a42bed8e55ac9 100644
--- a/ash/wm/common/always_on_top_controller.h
+++ b/ash/wm/common/always_on_top_controller.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "ash/wm/common/ash_wm_common_export.h"
+#include "ash/ash_export.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "base/macros.h"
 
@@ -18,7 +18,7 @@ class WorkspaceLayoutManager;
 // 'AlwaysOnTop' property. That is, putting a window into the worskpace
 // container if its "AlwaysOnTop" property is false. Otherwise, put it in
 // |always_on_top_container_|.
-class ASH_WM_COMMON_EXPORT AlwaysOnTopController : public wm::WmWindowObserver {
+class ASH_EXPORT AlwaysOnTopController : public wm::WmWindowObserver {
  public:
   explicit AlwaysOnTopController(wm::WmWindow* viewport);
   ~AlwaysOnTopController() override;