Merge "Don't return kPatchOatNeeded if there is no patch info." into nyc-dev