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

Change-Id: Ib9d8012348acd10068511e7793105519c151823b