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

Change-Id: I595ef7ed445cd973d413ac8f712d4ff8b67fff14