update B2G/Gaia to 2013-05-15 tips of b2g18/v1-train branches (w/pending fix)