cleanups

Change-Id: Ied27ee8ab38477f305c319cb8ac7d5e9eaf792c6
add missing cardview lib

Change-Id: I9fff93290e9a77591033313ded9dea123de8a5a4