Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1
am: e196918f54

Change-Id: Ic3d0ecb9377429eee45635847e564f347138398a