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

Change-Id: Ic06b31fff54b9600f7efe21274defe2c1b34cac6