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

Change-Id: Ie89a664bcc2e53f7a0b1d7c015c177670af3fddc