Backout 48b58294a6d5 (bug 829352) for breaking the Android build on a CLOSED TREE