Merge "include emma into core library on conditional flag"