Merge "Remove four counter increments out of the allocation path." into dalvik-dev