Merge "Remove obsolete ENABLE_TREBLE references."