8146979: Backport of 8046471 breaks ppc64 build in jdk8u because 8072383 was badly backported before
Reviewed-by: erikj, dholmes