Update patches and fix JAVA_HWC support