Merge "bootstat: test: refine reported test durations" am: bb52cbf35d am: 9d00f0079d
am: 7c4e845951

Change-Id: I085de07c4a74d1c70647dcc3715760440ecee6c2