Use new CM paths for Klimtwifi

Change-Id: Ide337ba05737668eddb8b45e0bc05b5d465dd526
android_ for cm

Change-Id: Iddb9e080ff9247e3dc8ecbe047a80dddc660957f
My main repos

Change-Id: I8fcfe8f8ee11f77cd9463af951cddb53c2379027