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

Change-Id: I5d8be6100ad9ddb468a17422aca7f7ce872b19b9