Backed out changeset d3867bfc10e5 (bug 921130) for Android compilation failures on a CLOSED TREE