pyramid: merge with shooter defconfig

Change-Id: I9a69db3c01e3276fad666432f01958132804d875
fix compile

Change-Id: I0c908b6a91bef188bc74612b7958ac821615d6d4