am 5165935b: am a528e850: Merge "Rename isDexOptNeededInternal and add kSelfPatchOatNeeded"

* commit '5165935b3de479a25a2b9188d7792f3c734d405f':
  Rename isDexOptNeededInternal and add kSelfPatchOatNeeded