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

Change-Id: I49c3ec5b5098cbc694be48490ced4cec57c62051