Merge "Opt in libcrt"