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

Change-Id: I54780496af5c749ea441b9909c467900936b2da6