Merge "Return actual failure to parse base APK" into rvc-dev