[vectorInstrinsics] merge with upstream failed

[Maurizio Cimadamore]

Hi,
the vectorIntrinsics branch failed to merge because of conflicts in 
assembler_x86.cpp. I tried to look at these, but there seem to be 
conflicting changes for vector instructions coming from upstream JDK and 
I was unsure on how to resolve them. I think it's best if people working 
on this branch take a look at this. To start a merge:

$ hg update vectorIntrinsics

$ hg merge -r default

<do merge>

$ hg commit -m 'manual merge with default'

$ hg push

Cheers
Maurizio