Clean up handling of apks

Change-Id: If8de63560ac92e36db8e4727bbf8d901eb0779d1
1 file changed