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

Change-Id: I406ed219fcf24745bde9c7fe45570d62378fbd85