Merge "Prune files from /data/anr/ by number as well as age."
am: 6941fcd88c

Change-Id: Ic0c9601520dc0c4a515f5cbffc4dd33cc35ae0c4