Merge "fix for adbd pinning CPU" into lmp-dev