This reverts commit ce0ad96d. Reason for revert: breaks screenrecord (b/119534075) Change-Id: I45af7b49a490601fcc68ca55c79f590bb0db1b01