Merge "Update libc/kernel/common/media/soc2030.h"