Apply changes to migrate to LLVM-160668-20120724. Change-Id: If546332f03e70e418c6039acccba0f827257dde2