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

Change-Id: I0326dde262a9afaeae5a76140fafea88f00fdfbf