Merge remote-tracking branch 'origin/master' into openbox

* origin/master:
  Add vendor/marvell/manufacturing to the manifest
  Add bluez

Conflicts:
	default.xml

Change-Id: I1e27efe03c2704d60bf4f388529a1e6eadc06937
tree: c53b4e65300c72442c50c3986630595186424a0d
  1. default.xml