Merge "Add thread usage output to lshal." am: 4a3e0a9767
am: 9a130151a2

Change-Id: I8045623cc47804816df7304cabea1633a18aeada