Merge "Allow stripped APK to be compiled with a vdex." into oc-dev