Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
am: f4a484064b

Change-Id: Ief00d5cd83017aa1e48786660e5b94b0f73f4af0