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

Change-Id: I4f42e58f4e88799eb44edacb00c50f210506c15a