Also organise imports with ImportRewrite

Change-Id: I23cbc36741f7d2591fb24d16a1b4f825c1e4c108
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>