Merge "Rename isDexOptNeededInternal and add kSelfPatchOatNeeded"