Merge "Revert "When updating a split app, copy compiled files from base.apk only."" am: 154535317e
am: 4a69261500

Change-Id: Icdd830af8054f0540e91afe739d794d35178db4c