linux-jkl-sp: bump to 3.12.21
java7-openjdk: drop this since font fixes are upstream