Merge "Stop shadowing __pure2 in math.h." am: 5b7b38f62e am: 69ba57faf4
am: 787d406d8b

Change-Id: Iae3d7a85e33385b4cd53394262d40b8429ab24e3