Merge "Move ActionMenuView into android.widget and make it public"