Merge "Merge files from jdk-17.0.3-ga into the aosp/master branch"