GO all CM as before on kitkat and track r5 from AOSP

Change-Id: I71327215e7cbd2c2d2bca4f74cb716143b15df4d