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

Change-Id: I51e4246fc7d1c88bc3d05eb75dc29fa664f7bca7