config: sync with v3.15.x multiplatform

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>