[AArch64] Merge from upstream trunk reverted

[Sofiane Naci]

Hi,

I've just reverted my recent merge from upstream trunk on the aarch64-branch
(r190119).
A cleaner and broader merge will follow.

Thanks
Sofiane