Merge "Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev am: 08b3fd966c am: ba06f3fd18" into oc-dr1-dev-plus-aosp