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

Change-Id: Ica1c0f55f2e3c6d1dabdadd74d82f3303de4b18d