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

Change-Id: Id282f5d472617f8ea30e40186a87d6a502faa104