Merge "Generic AOSP system image for non-A/B arm devices" into oc-dev