Merge "Add CPU ABI fallback directly into PackageState"