Bug 890040 - Follow-up to fix Android build bustage on a CLOSED TREE. r=me, a=lsblakk