Bug 866239 - Fix build on platforms without profiler after bug 853358 r=bgirard
Bug 863018 part 2 - Add JSShortString path back to ConcatStrings and LConcat. r=luke