This looks reasonable, but pleas add someone that did android changes (or code reviews) before as a reviewer. Could you do the i386 to i686 change first in another commit? http://llvm-reviews.chandlerc.com/D2325