Merge branch 'openjdk' into 8u152_1