Merge proposals dependent on lp:~aacid/unity-mir/clang_build_fix

lp:~aacid/unity-mir/clang_build_fix has no merge proposals.