Add xre and b2g_desktop resources, other minor improvements