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

Change-Id: Ie04409229e2f118f1785db46e2c6f3fb0aa7603e