Added better logging to the calculator suite.

Change-Id: I7499b93d50d79cd5540ffb28e7395fa201f40523
(cherry picked from commit 582883bea58514e76f9cfe23314b3958e749c152)
7 files changed