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

Change-Id: Iefd9ddb5703a632438a4ef98bc9ba59e04c35206