Merge proposals dependent on lp://qastaging/~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin

1. build-fixes-part-10-animationaddon-plugin
2. Dependent merge proposals