Merge "init: split security functions out of init.cpp" am: d467db9b3d  -s ours am: 6beea94675  -s ours
am: 31df396206  -s ours

Change-Id: I312eb890dc10c2eb7ce647bbbc1ccc1e280b1ab0