Implemented short-circuit evaluation on AND and OR operations.

Change-Id: Ieed01e463a1de42863cf24246377118af07a709a
Signed-off-by: marceloportilho <marceloportilho@gmail.com>