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

Change-Id: I929a3a58a569ca14c1be0c3ee7e534db9008f5d7