Merge "Adds support for restore dexopt flag"