Merge "Re-pin camera odex/vdex files only if they have changed" into oc-dev am: 9bb5e16657
am: 9406962b55

Change-Id: I17b7fbf9e980241f8bb28997cc7d43687dc99d2b