Revert "Fix Keon build error (display secure)"

This reverts commit a32a13409ad5cb016b18d1d2bcc7ec8f0241d5ed.
Revert "Fixes"

This reverts commit 9eac5fbe318db4c392208116e4e44706af95985f.
Revert "Consolidate with gecko_ics from codeaurora"

This reverts commit b93fc27b8d574b54bd136f587ffef9b75702631d.