Cleanup and prepare for 4.4 merge

mainly cleanup trds till TRDS 3.0 is back
Merge tag 'android-4.4_r1.1' into kk4.4

Android 4.4 Release 1.1