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

Change-Id: I49666ade2924855296407e85bb26af4d43c92275