Merge "When updating a split app, copy compiled files from base.apk only." into oc-dev am: 08b3fd966c am: 76aa10ba24
am: 71ead57955

Change-Id: Ief7665cafe1e15ca35f0aa4d5407dfdff431dfea