Android build fixed.  OWNER=rsesek.  Redo of https://chromiumcodereview.appspot.com/9288043 that does not break Aurabots.
Android build fixed.  OWNER=rsesek. 
Redo of https://chromiumcodereview.appspot.com/9288043 that does not break Aurabots.


BUG=
TEST=


Review URL: http://codereview.chromium.org/9225032

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@119526 0039d316-1c4b-4281-b951-d872f2087c98

yitian134/chromium,adobe/chromium,yitian134/chromium,ropik/chromium,gavinp/chromium,ropik/chromium,yitian134/chromium,adobe/chromium,yitian134/chromium,adobe/chromium,adobe/chromium,gavinp/chromium,adobe/chromium,adobe/chromium,adobe/chromium,ropik/chromium,adobe/chromium,gavinp/chromium,yitian134/chromium,ropik/chromium,ropik/chromium,gavinp/chromium,yitian134/chromium,gavinp/chromium,adobe/chromium,gavinp/chromium,yitian134/chromium,ropik/chromium,ropik/chromium,yitian134/chromium,yitian134/chromium,yitian134/chromium,ropik/chromium,adobe/chromium,ropik/chromium,adobe/chromium,gavinp/chromium,gavinp/chromium,gavinp/chromium,gavinp/chromium