[automerger skipped] Handle universal APK case in extract_apks am: 827c55f502 am: 400f1f1f84 -s ours

am skip reason: Change-Id I5ac64c845328a54024171da41c369050243462b0 with SHA-1 06fcac6f24 is in history

Change-Id: I90608b31ea82d20324ceefc003f5e2ddd0af2da1