[armv7][arm64] Speculative build fix after r159545.