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

Change-Id: I98861ff03d7f4b7045c87f745938ddd16149e9e7