Revert "Krait retention fix up"

This reverts commit d90672ad8ba5dfcdd0cf39518519e1a3ecfcb3c9.

Change-Id: Ic4ecae4645704c35d91b2d3ff0ba1a39eb484cee
Merge "Revert "Krait retention fix up"" into jb4.2