Merge "Stop shadowing __pure2 in math.h."
am: 5b7b38f62e

Change-Id: I5a673130d72f91c5ff1a745bcb91ddab9e453000