Adapt compilerplugins to Clang trunk towards 3.6

Change-Id: If6ee343bb4d4004e7a95fe1c5adc97210fc0abd0