Merge "Support split /system and /vendor modules from Soong"
am: 4e789c2e57

Change-Id: I877f4898e035bf50f4a7e59d1216e00ba14a3ffd