Merge "Add 0X as a valid hex prefix for parseint"
am: 392a2c8f0f

Change-Id: Ia9409c0424fab1966197ea5bb7a4532ed9a8c709