Bug 885023 - Follow-up to fix build bustage on Android. r=me