Merge "Revert "Enable loading of treble-based plugins""