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

Change-Id: I9d264f8e5a08984813e95b168eba8599b23ea521