Merge "Support split /system and /vendor modules from Soong" into oc-dev