Merge branch 'android-tegra-3.10' into android-tegra-flounder-3.10

eb9cf7d uid_cputime: Iterates over all the threads instead of processes.

Bug: 22833116
Change-Id: Ifec8e7e0c284c593a095faf0581044a99abdb140