Merge "OtaDexopt: Add version support" into oc-dev
am: 0c1b4769c7

Change-Id: Iafe977f04c59696181cd7d466e78693147b520e7