Add explicit dependencies on "core" libraries am: 0b75d36471
am: 866d8ec501

Change-Id: Ifff4ea8ab165d99fcda475687928aa6b0dae6799