[aarch64-port-dev ] aarch64: fix mismerge to jdk8u60-b21

[Edward Nevill]

Hi,

http://cr.openjdk.java.net/~enevill/jdk8u60/b21_merge.patch

Fixes a mismerge which occurred when I did the merge up to jdk8u60-b21.

It would seem that a number of files were still based on jdk8u45-b14 which was what I merged from.

I don't really understand how this happened and I apologise for any inconvenience.

Tested with client, server and server/fastdebug builds on jtreg hotspot & langtools.

All the best,
Ed.