am d0916f36: Merge "dex2oat: convert NULL to nullptr"

* commit 'd0916f36d27b643bca970f3645c38f44270c74ef':
  dex2oat: convert NULL to nullptr