Merge "Remove workaround to find the latest lsdump files"
am: e74a73a610

Change-Id: I1ca02ca2aafa9b263ad6862d2e0aad9e0644ae26