Adapt compilerplugins to Clang trunk towards 3.6

Change-Id: I0b7be1616a3e4206982f9f925de141ed9d53b96e