Merge "When updating a split app, copy compiled files from base.apk only." am: 8a945baf4a am: 47b1f54316 am: 2783f272b6
am: 27639484ef

Change-Id: I1c3d9dface747b5366f5472626935d43106893b3