Merge "Fix the detection for compressed APKs." into oc-mr1-dev