Merge "Minor improvements to apkcheck."