tree 177ac37c59e8e057f70fc1dd4baefd6703ffe5db
parent 7434760b13067cf93f8efc2ead8c54a32b6b42e9
author Ben Cheng <bccheng@google.com> 1360804622 -0800
committer Ben Cheng <bccheng@google.com> 1363037724 -0700

Fix full_x86-eng build.

[cherry-picked from internal master]

Change-Id: Ica412173eb34c7ec9911b36596f571a198a4df46