Merge "Return actual failure to parse base APK" into rvc-dev am: fd09fe5cea am: a8452260a6

Change-Id: I2fa9c71d0d88bda0f84c302b9f32f26099a7e205