Backed out changeset 8b809afd1cea (bug 1021258) for Android m8 bustage on a CLOSED TREE