Revert "Fix longentropysel typo (long entropysel)"

This reverts commit 03642a93953f3fbbbee282b382e6535b795bc6f2.
Revert "Bring over vigor_aosp_defconfig into the pyramid kernel"

This reverts commit 89b74de59d383f4f8739ebda194b724cc39d0425.