This reverts commit r303732, as it introduces a regression in TestLoadUnload on android. llvm-svn: 303740