Merge "Remove CompileTimeIfElse." am: 6d8aff5fdc am: b810209438
am: 4cd2c82e6e

Change-Id: I830c45b495df8ec504f506bfbbea97c5e82f31b3