cheets: More improved test counting in case of repeated crash and duped tests. am: bf5a85b055 am: 94b4c97a89 am: 571d41e00e
am: 0dc9a7ed51

Change-Id: I438b7246f4211fbdc21f7ec3031b6dcdc5c460f1