Revert "Ondemand tweaks from Semaphore"

This reverts commit ae27dd2c7f726ee28e0cd444f44d8eeaf2784d97.
security: commoncap: fix compile without CONFIG_ANDROID_PARANOID_NETWORK

Change-Id: Ie9231808102bb13c3261965372057a20208a44e7