Merge "Support halt the trace when schd-dbg hit deadline" am: f232542c03 am: 9d57a08f8e
am: 79453d7171  -s ours

Change-Id: Id31db457d4469e55299c63196c2e15d2d6d9c405