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

Change-Id: Icffc2a1e046b4bd6fc52a9b61dbb54f477824fef