Merge "Fix missing offset for apk."