Merge "Enabled embedded_launcher for perf_proto_flames" am: 7dd8a41a28
am: f153c6467d

Change-Id: I81826efe7efc3d54eb70491d28ae2d438d89beea