Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev