Merge "AndroidPackageParsingTestBase: Re-throw failures in setUpPackages in individual tests" into rvc-dev am: 8555b9a166 am: d1632fd84c

Change-Id: I32b8f80e8d96b4361d3f45271e9c75ddb501b0f0