Merge "New assets (wifi, bluetooth...)" into gingerbread