Fix dependency issues for newer Eclipse versions

Change-Id: I8ab548f3c497f368ca1752e65ce7190d81087917
(cherry picked from commit 1cf5616fd8786def9b948d9dc41d43306534758e)
2 files changed