Merge "Select correct oat/odex when pinning the Camera APK" into oc-dr1-dev
am: 1a7d4c25b3

Change-Id: I230dfa9275ad5d873a0ce9e3fba201f0bbf01af2