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

* commit '803fa99a226f7a8ac04dc73f2c30526fb53a5356':
  dex2oat: convert NULL to nullptr