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