java_{lang,rt} up to date with changes in master and devices2