trimming unused defines
Merge branch 'refs/heads/master' into no_crash_reporting_id_alternative