Clean up handling of apks

Change-Id: I010ce1f8b37d3f8c91d5d557f16b997dcb357fbf
1 file changed