Backed out changeset cb6165af87e7 (bug 929011) for Android Build Bustage