Merge "Get rid of dependency on core from linux build (2/2)"
am: 77a4c05a7e

Change-Id: Ib422f87fd63925236b650eaa9d6e2968ab932658