Merge "Adds support for restore dexopt flag" am: 91c72e7916

Change-Id: I953e99964c330cd016718e5048a28787dff7e8f2