Merge "atrace: Add mali_systrace ftrace events to 'gfx'" am: 499ee25407
am: 73bf7a040f

Change-Id: I7f201ee7613cd9f8820b2a2a48d07508aed02227