Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea
am: 221e58fe95  -s ours

Change-Id: I3e70c3a349fd4ce05e88b84e2b987bbf26cadeba