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

* commit '5007581880fb48aca829172a161780c2376e212b':
  Rename isDexOptNeededInternal and add kSelfPatchOatNeeded