Fixed issue with extra function

Fixed issue with goodbye_security function, which shouldn't be here.

Change-Id: I76362607b2d879bf053bbece304cd0ac337b8008
Closes-Bug: #1320181
(cherry picked from commit 703a1820b9fa3d3b99cf425921494a4b74f3fbbb)
Merge "Fixed issue with extra function" into stable/4.1