Sync smdk4412 up to muppets

PS2 : Cleanup CM

Change-Id: I0c15c4c8f33e5c1e280586decdbdb4b384e174c3
Merge "Sync smdk4412 up to muppets" into jb4.2