Merge "Revert^2 "Reduce the number of calls to Jit::AddSamples.""
am: 6c22540b2c

Change-Id: I27d42346756eaacac34ab8698d855d8679ff8901