Merge "Update the stack script for apk handling."