am 71c9f075: Clean up handling of apks

* commit '71c9f075dafa7c5fc16d94a6992b101867b9b694':
  Clean up handling of apks