Merge "Consistently say va_arg rather than __va_arg." am: 3e523a65 am: d02c95a2 am: 3cd9c64e am: 93bb1c23 am: 4771794e Change-Id: I9f2ee2443d993700445b010f9654aedc2ef52713