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

Change-Id: Iabcb03567e71585898f60160a3e0a5c8e6870f3b