Merge "Raise an error instead of panic in SplitApexJarPairs." am: 7645764e58

Change-Id: I5a65eed47005ea7687b686b1a90abc08360c6bc2