This reverts commit 8147b0ea. Reason for revert: Breaks screenrecord (b/119534075). Change-Id: Iea02806d896ac53c805c27ed745f325456d9a3a4