Merge "Update tradefed-prebuilt to sync with log filer changes."