Fix two bugs in jitzygote configuration. am: 741a0707d4
am: 6bd68001be

Change-Id: I412bc4ac3b5e04921c20c0e9d86370a56810d515