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

Change-Id: Ia91f126900e3c52016af233f33c47b0a3c38d111