Merge branch 'master' of git://github.com/CyanogenMod/android_external_dropbear into HEAD

Conflicts:
	Android.mk

Change-Id: I19b14f6ad3bf19fe8b471244512c09e4580e9835