Merge "Increase core count in atrace.rc"