Brian Carlstrom 98e1e18c1c Fix build.
git cherry-pick --no-commit  22a614142aacce13fc46a0e524dbfb6ca56bf237

Change-Id: I1409bc3dd1f1b3027c12355e8b6aeffa2d857c83
2011-06-22 11:35:11 -07:00
..
2011-02-23 12:00:42 -08:00
2011-06-22 11:35:11 -07:00