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

Change-Id: I88c81184669adf69686af3af649b5f602720e57b