Merge "Prevent system app upgrading from multi-arch to single-arch"
am: 5cac6ed047

Change-Id: I0e7c6fbea14dcf401076994fa53b9ce66324bb4a