Teach autotests to work on x86-alex32 and x86-zgb32.

This is a combination of 2 commits.

The first commit's message is:

Teach autotests to work on x86-alex32 and x86-zgb32.

BUG=chrome-os-partner:9174
TEST=Remote trybot run.

Reviewed-on: https://gerrit.chromium.org/gerrit/20795
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
(cherry picked from commit 68df207250dbe0b79e8545c144d087b1886e5f07)

Add support for x86-alex32 and x86-zgb32.

BUG=chrome-os-partner:9174
TEST=Remote trybot run.

Reviewed-on: https://gerrit.chromium.org/gerrit/20796
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
(cherry picked from commit 9d7e1c0c6dcf34e4a35960c33ac6c5ee4c49ba77)

BUG=chromium-os:30387
TEST=grep for x86-alex and x86-zgb
Change-Id: I4286391f64a1c556d52aa01f385b58974558bb74
Reviewed-on: https://gerrit.chromium.org/gerrit/21644
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Tested-by: David James <davidjames@chromium.org>
diff --git a/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py b/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py
index ec8b5bd..9212d17 100644
--- a/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py
+++ b/client/site_tests/desktopui_AudioFeedback/desktopui_AudioFeedback.py
@@ -30,7 +30,8 @@
                            {'name': _CONTROL_CAPTURE, 'value': "100%"},
                            {'name': _CONTROL_CAPTURE_SWITCH, 'value': "on"}]
 
-_CONTROL_SPEAKER_DEVICE = ['x86-alex', 'x86-mario', 'x86-zgb']
+_CONTROL_SPEAKER_DEVICE = ['x86-alex', 'x86-alex32', 'x86-mario', 'x86-zgb',
+                           'x86-zgb32']
 _CONTROL_SPEAKER_DEVICE_HP = ['stumpy', 'lumpy']
 
 _DEFAULT_NUM_CHANNELS = 2
diff --git a/client/site_tests/desktopui_MediaAudioFeedback/desktopui_MediaAudioFeedback.py b/client/site_tests/desktopui_MediaAudioFeedback/desktopui_MediaAudioFeedback.py
index 9fe1718..45a96f2 100644
--- a/client/site_tests/desktopui_MediaAudioFeedback/desktopui_MediaAudioFeedback.py
+++ b/client/site_tests/desktopui_MediaAudioFeedback/desktopui_MediaAudioFeedback.py
@@ -30,7 +30,8 @@
                            {'name': _CONTROL_CAPTURE, 'value': "100%"},
                            {'name': _CONTROL_CAPTURE_SWITCH, 'value': "on"}]
 
-_CONTROL_SPEAKER_DEVICE = ['x86-alex', 'x86-mario', 'x86-zgb']
+_CONTROL_SPEAKER_DEVICE = ['x86-alex', 'x86-alex32', 'x86-mario', 'x86-zgb',
+                           'x86-zgb32']
 _CONTROL_SPEAKER_DEVICE_HP = ['stumpy', 'lumpy']
 
 _DEFAULT_NUM_CHANNELS = 2
diff --git a/site_utils/lab_test.json b/site_utils/lab_test.json
index c023f9d..cab2419 100644
--- a/site_utils/lab_test.json
+++ b/site_utils/lab_test.json
@@ -8,8 +8,10 @@
 
     "board_platform_map": {
         "x86-alex": "netbook_ALEX",
+        "x86-alex32": "netbook_ALEX",
         "x86-mario": "netbook_MARIO_MP",
         "x86-zgb": "netbook_ACER_ZGB",
+        "x86-zgb32": "netbook_ACER_ZGB",
         "stumpy": "desktop_STUMPY",
         "lumpy": "netbook_LUMPY",
         "tegra2-seaboard": "netbook_TEGRA2_SEABOARD_T25",