This reverts commit cabe101cd2. Bug: 109839239 Reason for revert: Treble/VTS backward compatibility Change-Id: Ibef1d91261fe6318c65fd617a2bee7f5d69bebae
cabe101cd2