[optimizing] Improve constant folding on logical and am: 4eb6eb40e8 am: c76e521a66
am: 3ee0f706a3

Change-Id: I2a5bff96bce1cf95c4469cf174e74ceee872de72