Adapt compilerplugins to Clang trunk towards 3.6

Change-Id: Id1ce6c59f705f9c42855995e0ad590c6a3646613