Merge "Revert "Check ro.treble.enabled for legacy devices""