Merge "Prevent system app upgrading from multi-arch to single-arch"