Blind fix for fixing 689-zygote-jit-deopt on host bionic. am: ab682a78d9
am: e4df40e208

Change-Id: I568ffb9d92dfafd3922c3b127b5515dfae230b32