Revert "fix duplicate LIBRARIES : build fix"

This reverts commit 222546d93815745ae85ffb186778397e62f1a06b.

Conflicts:
	camera/Android.mk