Bug 567234: Upgrade target platform to 2020-09 some Expression classes were moved by Eclipse. We needed an indirection here to keep compatibility over multiple eclipse versions.Change-Id: I0695524e07165d780599d58c4cd551d8228a4a33