Initial re-do of a merge between pyramid defconfig and 3.0's vigor defconfig

Change-Id: If7ea3eb6ef933779d0acfea4295344b17377465f