Merge "Avoid use of pthread_getschedparam (except on the Mac)" am: 9be1524c85
am: 8a2596e109

Change-Id: I07587fdc0efe6638d98d8474e8944b0c2e4da1ba