Merge "Remove CompileTimeIfElse."
am: 6d8aff5fdc

Change-Id: I0a23c1d7174098acc43de368bbb9e25785fb6222