track aosp 4.4.4_r2

Change-Id: I73f0df7ffe89310b1d4eafbc73fc3b65b384da98
track cm cardslib

Change-Id: I530c79e42a19cb826f8c149b1605aac94bce70f1