OpenDelta: SimpleAOSPifization (2bis/2)