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

Change-Id: I0fff716c3dcc1ce699666b4cd0794930c188400b