am a861beec: Merge "Update the stack script for apk handling."

* commit 'a861beec5ca91342c976221762ac5dfb513d09c4':
  Update the stack script for apk handling.