Squashed smdk4412-common updates from the muppets

Change-Id: Ic722ed2733cbef468d54a343cb2a0fff1e69c84d