Fix build w/o core library

Change-Id: Icf9bf90a6bcee3cd0dd28e27f19a75d53438e429