Merge "Remove dalvik trace tag for long trace config."