cleanup from samsung merge, part 2

Change-Id: Ifaf6d5e16df63e3bb9b721a9855c5c1d21034df3
update defconfigs and sec_debug

Change-Id: I86994642a9ffe40d3d186b3fc5506d1804a539d9