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

Change-Id: Id7236590276201928ba8abab549f3175d616a7bc