pyramid: merge with shooter defconfig

Change-Id: I9a69db3c01e3276fad666432f01958132804d875