Merge "ENABLE_TREBLE is deprecated" into oc-dev