Merge "Inferno: A framegrapher based on simpleperf" am: af30023228 am: d8f0a1eb93 am: f72ee84ba0
am: f48607ac87

Change-Id: I19d9b0a810ce8dea5142af158924a9c33a660544