Bug 1030741 - Follow-up to fix android bustage. r=me