Adjust the back button and X icon in action bar for alignment.

Bug 29831679
Bug 29154966
Bug 28944621

Change-Id: Ib0a7a1d26acc4862efed2a88f948b121c71f3e7b
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index a599e4c..ecadbd1 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -26,7 +26,7 @@
         android:id="@+id/search_back_button"
         android:layout_width="@dimen/search_box_icon_size"
         android:layout_height="@dimen/search_box_icon_size"
-        android:layout_margin="@dimen/search_box_navigation_icon_margin"
+        android:layout_marginEnd="@dimen/search_box_navigation_icon_margin"
         android:src="@drawable/ic_back_arrow"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/action_menu_back_from_search"