[automerger skipped] Merge "Split base.mk into system and vendor parts." into stage-aosp-master
am: 8500a01e0c
-s ours
Change-Id: I99bbf7569cdbb15d6c4f9c6e31e58c1321f28445
This commit is contained in:
am: 8500a01e0c
-s ours
Change-Id: I99bbf7569cdbb15d6c4f9c6e31e58c1321f28445