d2: sed -i 's/d2-common/d2/g'

Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>

Conflicts:
	Android.mk
	extract-files.sh
	setup-makefiles.sh