wifi and bluetooth changes

Change-Id: Ib6835a68c550b7634c01a8fd9aae6237cc1e4bc7

Conflicts:
	ramdisk/init.cm-star.rc