several @hide derps and don't be lazy

please all we need to take care on such things

fixed all related derps

as well move out TRDS from currents to be clean AOSP.

Change-Id: I914d7b3bb607e70c39559340fab4d97b8c5efe31
Merge "several @hide derps and don't be lazy" into jb4.3