Use 0x for hexadecimal prefix

0X is a legal hex prefix, but tools like pfff and my syntax highlighter
prefer the more common 0x.

Change-Id: I38bba068f9a97566b0df9fb0a2fe72d25519a21b
Merge "Use 0x for hexadecimal prefix"