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

Change-Id: Id882467304f09f2205f02286311cff04ae431a09