msm7x30: Bluedroid setup.

Change-Id: I06fa2421bc22d33cdae4bff8b024e3b91d765495
msm7x30-common: use new audio and display variant flags.

Change-Id: I89eb0c2edcaf1cb81586db8cc23123b4a20b7197
Merge remote-tracking branch 'Evervolv/jellybean' into HEAD

Conflicts:
	BoardConfigCommon.mk