Merge "Add libbase as a dependency for slideshow" am: e57830b20a am: b0f9502d00 am: b990a6154f
am: 847f2b377e

Change-Id: I447fd2c3144e2b8c15d2c70dbb8fe5438e25d4b4