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

Change-Id: I7c2733ac9dfe60ed8a629d5d312b760c53baa76e