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

Change-Id: I4133c2f0eb21a282385cbb05656b115e9a5b4dfa