[automerger skipped] Merge "Split base.mk into system and vendor parts." am: 351a147cd7
-s ours
am: 3a9fa70d5a
-s ours
Change-Id: I6ca01f204514be7c392789522481abd26d9f53d3
This commit is contained in: