Merge "Remove a few preprocessor cases testing undefined behavior" into nougat-cts...