This reverts commit fe0be0c1c4. Reason for revert: Appears to be the root-cause behind b/267581040 Change-Id: I51ac488de4326d39c7e33f37764cba0b65b84caf Signed-off-by: Will Deacon <willdeacon@google.com>
fe0be0c1c4