patches update to sync with latest cm source and unify patches.

Change-Id: Idcba2435980a32aa2fe4bd8d99ca8e491d1cd1a8