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

* commit '86354b048e8d87c2a308ce9aafaac685406293fe':
  dex2oat: convert NULL to nullptr