Change-Id: I014ce98c61b12169e381b769af34b682df46087e
So unbundled branches don't need to include the system/core project. Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146