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

Change-Id: I7f3c76af95c049425985b6dd89d00c75dfe24c80