Merge "Prevent droiddoc from printing running time."
am: 932d50a32c

Change-Id: If2e44787e264e81c37874733075a896c9ef3607b