Merge "Removing dalvik/hit, replaced by tools/base/perflib"