Backed out changeset 38a66e499ca8 (bug 876782) for B2G build bustage. a=backout