Porting to llvm-mirror branch release_33