Revert: base: Fix screen recorder2

Change-Id: I8d3b542d9cce67b896b3134e6550ff125fab672c