Backed out changesets d3855e27cb32, 6ac71c1149a5, and b8d0cbe94d15 (bug 971939) for Android bustage.
CLOSED TREE