Fix issues in --enable-entropy and --enable-cb4x4

Change-Id: I148d60d56599a238c60c429572a25cbddbe5191d
3 files changed