Merge "Update Android-changed markers in some sun.security classes."