Merge "Removing unnecessary org.w3c.dom subpackages"