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

Change-Id: I3e0605d8d6e9dcc6ecc68bb7af58afc3ee8f7b33