Merged r14969 into trunk branch.

Fix Android build issue 247303

BUG=247303
R=ulan@chromium.org

Review URL: https://codereview.chromium.org/16433003

git-svn-id: https://v8.googlecode.com/svn/trunk@14971 ce2b1a6d-e550-0410-aec6-3dcde31c8c00