Merge "Explicitly compile against core-all"