Merge "dex2oat: convert NULL to nullptr"