RFR: JDK-8302696 Revert API signature changes made in JDK-8285504 and JDK-8285263

[Mark Powers]

https://bugs.openjdk.org/browse/JDK-8302696

-------------

Commit messages:
 - Merge
 - first iteration

Changes: https://git.openjdk.org/jdk/pull/13391/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=13391&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8302696
  Stats: 3 lines in 3 files changed: 0 ins; 0 del; 3 mod
  Patch: https://git.openjdk.org/jdk/pull/13391.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/13391/head:pull/13391

PR: https://git.openjdk.org/jdk/pull/13391