Revert r311842 - [cmake] Remove i686 target that is duplicate to i386

The required change in clang is being reverted because of the Android
build bot failure.

llvm-svn: 311859