Merge "Adds support for restore dexopt flag" into rvc-dev am: 931c87d986

Change-Id: I21c758b53ef0e4d9aea344a14f3c5dfbbb361af2