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