Backed out changeset 6562cc879c53 (bug 845080) for Android build bustage on a CLOSED TREE.